Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 21:18:15 +0000 (22:18 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 21:18:15 +0000 (22:18 +0100)
commita62bc811fe297c300b4187e4ce789566bf64c243
tree741f15a03ceae3d651f1611a7c0a7b8ef9fb33ee
parentf674d6427fed3d070d01120a3ab65caaef4aa5c7
parent59c9dbc01d2f2c646c6cdc600434542bed54b9bd
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
xen/arch/x86/mm.c
xen/include/public/xen.h